switchroot: Fix test-switchroot now autotools can build static
authorWilliam Manley <will@williammanley.net>
Wed, 31 Aug 2016 17:14:19 +0000 (18:14 +0100)
committerAtomic Bot <atomic-devel@projectatomic.io>
Thu, 1 Sep 2016 20:17:58 +0000 (20:17 +0000)
This test previously depended on manually building ostree-prepare-root.
Since 42dab85 we've been able to build static binaries with the usual
autotools build-system.  This change reflects the fact that
`ostree-prepare-root` is built into $srcdir rather than `src/switchroot`
where I was building manually.

This test now passes with `./configure --with-static-compiler=gcc` (glibc)
but still fails with `./configure --with-static-compiler=musl-gcc` (musl).

Closes: #485
Approved by: cgwalters

tests/test-switchroot.sh

index 17085140c6e152af115c4015a4dd3f84d59b8daf..96c849e54595721e941b875d7fac8a99af22c128 100755 (executable)
@@ -6,7 +6,7 @@ setup_bootfs() {
        mkdir -p "$1/proc" "$1/bin"
        echo "quiet ostree=/ostree/boot.0 ro" >"$1/proc/cmdline"
        touch "$1/this_is_bootfs"
-       cp "$(dirname "$this_script")/../src/switchroot/ostree-prepare-root" "$1/bin"
+       cp "$(dirname "$this_script")/../ostree-prepare-root" "$1/bin"
 }
 
 setup_rootfs() {